Sync from kubeflow/model-registry acdf013#8132
Conversation
📝 WalkthroughWalkthroughThe Supply chain surface (CWE-829: Inclusion of Functionality from Untrusted Control Sphere): This is a subtree commit pin change. The new SHA
🚥 Pre-merge checks | ✅ 9 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (9 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
/retest |
27967ea to
6cc0f20
Compare
…304b7145ac0e11c1c62f (no file changes)
…99a78be9c983a2a3ccc7 (no file changes)
…69b132ba2c0c18465ed1 (no file changes)
…ad5ee1f9c00fdc141e94 (no file changes)
…f9b4ddb5a1c3d76b9f6e (no file changes)
…2bf94bdc6a94fdc88d9c (no file changes)
…f76a7a6e2d8236c685a4 (no file changes)
…talog card and details page (opendatahub-io#2827) (resolved conflicts) Upstream commit: cc54e0d36e70eaad1a3f8a9c98f75ed005214b04
…2c737c349f996360ab90 (no file changes)
… and slider rounding for performance filters (opendatahub-io#2822) (resolved conflicts) Upstream commit: 5ff24d696e2cba56ef6e2b4dff4dba6a80351678
…60037b56b0e1b9e98f29 (no file changes)
…bd5f8abc65baca613154 (no file changes)
…f6214ce5e5bf731a9ae2 (no file changes)
…a4c0a96671586e803c94 (no file changes)
…64f1872c021a1e8f13f9 (no file changes)
…si/gomega from 1.40.0 to 1.42.0 in /clients/ui/bff (opendatahub-io#2833) (resolved conflicts) Upstream commit: 92b09821a093167b29156bd0594edffb83b53ac7
…0b9ba3ccd7d59c67d139 (no file changes)
…me (opendatahub-io#2847) Upstream commit: 801ef92f4eddacdaf4fad808203b098a00b0d698
…6 to 0.2.7 in /clients/ui/frontend (opendatahub-io#2839) (no-op, already at 0.2.7) Co-authored-by: Cursor <cursoragent@cursor.com>
…629c7d4d7319235fb981 (no file changes, tmp already at 0.2.7) Co-authored-by: Cursor <cursoragent@cursor.com>
…igs from cold-start artifacts and filter query OR clause (opendatahub-io#2852) (resolved conflicts) Upstream commit: 37bb620e09751a42ca589303fb2399dff7fa0308
…m 4.0.5 to 4.0.6 in /clients/ui/frontend (opendatahub-io#2845) Upstream commit: ef896c3877ec18e6feca9c97210307ae5850edbb
Co-authored-by: Cursor <cursoragent@cursor.com>
…si/ginkgo/v2 from 2.29.0 to 2.31.0 in /clients/ui/bff (opendatahub-io#2831) (resolved conflicts) Upstream commit: da7e71a499297ca4017768be8a849e8883093163
… from 2.11.1 to 2.14.1 in /clients/ui/frontend (opendatahub-io#2844) Upstream commit: e015d67717a9ee8f692b038707168dce7dd8e992
…m 3.4.0 to 3.4.10 in /clients/ui/frontend (opendatahub-io#2849) (resolved conflicts) Upstream commit: f4324ea8bb4245761f14c4ac2973075a05f93542
…tainer with InnerScrollContainer for hardware config table (opendatahub-io#2854) Upstream commit: 5848ed75b70f288eebd6e9509e90b22ea9be34e2
…om being passed when the performance toggle is off (opendatahub-io#2853) Upstream commit: acdf0135544891be7e245017356b6731e5e01e56
6cc0f20 to
4ad3028
Compare
Left over from conflict marker removal during subtree sync. Co-authored-by: Cursor <cursoragent@cursor.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: manaswinidas The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
65adc6d
into
opendatahub-io:main
Description
Sync to pull in changes from:
Conflicts Resolved
The following conflicts were resolved during this sync:
#2827 - Fix the label order in model catalog card and details page
frontend/src/concepts/modelCatalog/const.tsfrontend/src/app/pages/modelCatalog/components/ModelCatalogLabels.tsxNature of conflict: The downstream fork has an additional
RED_HATkey inMODEL_CATALOG_POPOVER_MESSAGESthat upstream does not have, causing context mismatch inconst.ts. InModelCatalogLabels.tsx, the downstream version had adata-testid="validated-task-icon"attribute on the validated icon that upstream did not include.Resolution: Applied the upstream text change to the
VALIDATEDpopover message while preserving the downstream-onlyRED_HATkey. ForModelCatalogLabels.tsx, took the full upstream version which adds task sorting logic (validated tasks first) and a provider label.#2822 - fix(ui): fix reset-all-defaults and slider rounding for performance filters
frontend/src/concepts/modelCatalog/const.tsNature of conflict: Same downstream
RED_HATkey difference caused context mismatch for the patch targetingPERFORMANCE_FILTER_KEYSandgetAllFiltersToShow.Resolution: Applied the upstream changes — moved
MIN_VRAMandIMAGE_SIZEout ofPERFORMANCE_FILTER_KEYS(sidebar-only filters) and added them explicitly ingetAllFiltersToShow. Preserved the downstreamRED_HATkey.#2833 - chore(deps): bump github.com/onsi/gomega from 1.40.0 to 1.42.0
bff/go.modNature of conflict: Downstream has different
go.modcontext (differentkubeflow/hub/pkg/openapiversion) causing patch context mismatch.Resolution: Applied the gomega version bump from v1.40.0 to v1.42.0.
#2839 - chore(deps): bump tmp from 0.2.6 to 0.2.7
frontend/package-lock.jsonNature of conflict: Downstream already had
tmpat v0.2.7, so the patch context expecting v0.2.6 didn't match.Resolution: No-op — the downstream was already at the target version. Conflict markers removed.
#2852 - feat(ui): resolve hardware configs from cold-start artifacts and filter query OR clause
frontend/src/app/pages/modelCatalog/components/ModelCatalogCardBody.tsxfrontend/src/app/pages/modelCatalog/utils/modelCatalogUtils.tsNature of conflict: Downstream import paths differ from upstream (
CatalogSourceimported from~/app/modelCatalogTypesvs~/app/shared/types/catalogTypes), causing context mismatch.Resolution: Applied all upstream changes (cold-start artifact separation, hardware config resolution, filter query OR clause) while preserving downstream import conventions.
#2831 - chore(deps): bump github.com/onsi/ginkgo/v2 from 2.29.0 to 2.31.0
bff/go.modNature of conflict: Downstream
go.modhas different context around theginkgodependency line.Resolution: Applied the ginkgo version bump from v2.29.0 to v2.31.0.
#2849 - chore(deps): bump dompurify from 3.4.0 to 3.4.10
frontend/package.jsonfrontend/package-lock.jsonNature of conflict: Downstream was already at dompurify v3.4.9, so the patch expecting v3.4.0 didn't match.
Resolution: Updated from v3.4.9 to v3.4.10 in both
package.jsonandpackage-lock.json.Additional Downstream Change
ValidatedModelsBanner.tsx.How Has This Been Tested?
Tested by running the federated model-registry package locally, verifying existing behavior in the files this diff touches, and verifying the incoming changes.
Also ran available test scripts in
packages/model-registry/upstream/frontend:test:lint— passed (0 warnings)test:unit— 823 tests passing across 64 suitestest:type-check— passed cleanTest Impact
Upstream changes include their own tests.
Request review criteria:
Self checklist (all need to be checked):
If you have UI changes:
After the PR is posted & before it merges:
main